From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 6 Aug 2013 14:32:59 +0000 (-0400)
Subject: popupMenu: Don't propagate the 'activate' signal on menu items
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3808
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c58a2e8e467cfe8740397b742825bf2add761356;p=gnome-shell.git

popupMenu: Don't propagate the 'activate' signal on menu items

We used to do this to close the menu when activating, but now we have
the itemActivated call which explicitly calls up to the toplevel.
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index fce1d2fd7..261e4c5b6 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -819,9 +819,6 @@ const PopupMenuBase = new Lang.Class({
         }
 
         if (menuItem instanceof PopupMenuSection) {
-            let activateId = menuItem.connect('activate', Lang.bind(this, function() {
-                this.emit('activate');
-            }));
             let activeChangeId = menuItem.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged));
 
             let parentOpenStateChangedId = this.connect('open-state-changed', function(self, open) {
@@ -838,7 +835,6 @@ const PopupMenuBase = new Lang.Class({
             }));
 
             menuItem.connect('destroy', Lang.bind(this, function() {
-                menuItem.disconnect(activateId);
                 menuItem.disconnect(activeChangeId);
                 this.disconnect(subMenuSensitiveChangedId);
                 this.disconnect(parentOpenStateChangedId);
@@ -852,16 +848,12 @@ const PopupMenuBase = new Lang.Class({
                 this.box.insert_child_below(menuItem.menu.actor, before_item);
 
             this._connectItemSignals(menuItem);
-            let subMenuActivateId = menuItem.connect('activate', Lang.bind(this, function() {
-                this.emit('activate');
-            }));
             let subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged));
             let closingId = this.connect('menu-closed', function() {
                 menuItem.menu.close(BoxPointer.PopupAnimation.NONE);
             });
 
             menuItem.connect('destroy', Lang.bind(this, function() {
-                menuItem.menu.disconnect(subMenuActivateId);
                 menuItem.menu.disconnect(subMenuActiveChangeId);
                 this.disconnect(closingId);
             }));